Merge branch 'stable-2.16'

Change-Id: Iea5317873e16cbe794c66e851e56afecdb496e6a