Merge 599929c062be56d0c4d06f22eb931c6654526e17 on remote branch

Change-Id: I95f3ef9d10f32891a6a464b7be3aec6025f7151a