Merge 7a134ad310da728170e57404a0945cc890785dc0 on remote branch

Change-Id: I2f67140854c43fc5d6d48fc41c5aecc9fb11ff93