Merge dc9f5b41247cd31d97d7e1377def92909c11ef31 on remote branch

Change-Id: Ie3281761fabd3e4319b9bb8e78ffc26e5fd1876b