Merge 5476ff4e8f02f56aa1b56362c6e786ed0f76cd8e on remote branch

Change-Id: Ic695d0072e9bb8c15bb1ab5ae12ae21a7d52f183