Merge branch 'stable-3.0'

* stable-3.0:
  Update git submodules
  Update git submodules

Change-Id: Icf7ca7f8303837f0874c12f0820a5f2cdd6affa8