Merge 4b1df1a095d94f95b923481b0bd74da79c9a4e77 on remote branch

Change-Id: I788d4fcddb8182d2a0553950f59ecc5d37d75b18