Merge 0c8af79193cfdc14b92c62647250efdd623df2a8 on remote branch

Change-Id: I2d07be200767580473f3526ecbebf19d09d53532