Merge 75127c806e5a3f2315f911d9d9aad3f0d2501c26 on remote branch

Change-Id: Ic3b62f605ff9efee257aa3da2c972f5401daf3bb