Merge fa259f46c2ce1f9ec0030c1f815440cf173a718e on remote branch

Change-Id: I2b2cd81078750943e22615455e762b499712a201