Merge 44f100057998df58e805f212d038a0139e80ae46 on remote branch

Change-Id: Ib97cd3b33a1c7cd06632a186bd3f9cfed7669ce0