Merge d27ac0a82425572a04f22c8141c7a7ee5bebdb1b on remote branch

Change-Id: Id828fbb8ae87abbd3dbaad1593321e6fc04cd37e