Merge 10f0a211e594938a273a6458f1180cae18e7f512 on remote branch

Change-Id: I2bf5afb67badfef458ab57a0cd2da7c96901799a