Merge 7565fdb5b300a2c75b82c6cbfc8138546cdbc3c3 on remote branch

Change-Id: I6ed5127411792b2eb3594062441fb027ab041a3d