Merge 779dc75d9948cf5783d87a0fd17e8563e1e10872 on remote branch

Change-Id: I2b636f415ea360aa047873732fdcb39d01195212