Merge 75b5f1db952c1a883ddd4cccb55f546f30287674 on remote branch

Change-Id: I8642be3c4e0a4d0a2b166cb31de0cf38ebc68c01