Merge 1379f51508783fc2c13435b46e46a677fa88e970 on remote branch

Change-Id: Ib592de1841614b46289feb3fc332c8e9c1743ef6