Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update git submodules

Change-Id: I28390f3c96b8e1287c9ce966d65db2405b2cfbac