Merge 5983e148aa423e86d3eca20ad8d7791b4db553c0 on remote branch

Change-Id: Ib8606514cdcbdb8f7cb130fe9ac6cd45ed5c502d