Merge 4c9f9b9ac231e1aa504ff722a2df28c41d4193c3 on remote branch

Change-Id: I05f8c93d719ea2ff0b59907f919dbe6956673085