Merge 8592ca16375aed5abdaf7c2d9d495b76dd0ceb53 on remote branch

Change-Id: Ie3c87d880b9b16e4b32e362273903e3358f78f8d