Merge a867a7feac9f30a8a28be1ba5d0ca9679e8f874a on remote branch

Change-Id: If06d75bbe070506213e91458f4969a25d1d4ba95