Merge 68b5f23cd4552c523e55d9446dcaa6672456c2f3 on remote branch

Change-Id: I2730fd4e9deaae4600ae3d494a3fc9fb13cf4e0c