Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Update git submodules

Change-Id: Ied97b0115db7ecaa877520571cd1668eb4148d2f