Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Update git submodules
  Update git submodules

Change-Id: Idc98b8c040687ded6329b746249ebbe8e213f952