Merge 9947cc6aecc820de38d31f644df2c4d354f9ced8 on remote branch

Change-Id: I5b4151f56716b48e6194ac597c592f83bc0ae738