Merge 99eab50ce3d572787eb8c80ba7a02736233edb58 on remote branch

Change-Id: Ibfd3211fda91052719c77293387ea1b989e23916