Merge 316ca54d25787f94122456822dfc46f674160e63 on remote branch

Change-Id: Ic1b4fceeb1bf37ad27d5eebb893a74813a277845