Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update git submodules

Change-Id: Ia3485c3aac3954e0f4a5d36360ea4de5020ef273