Merge 6a0a4c3989f0e8e78c291ebdc1962c508712ed79 on remote branch

Change-Id: I3f0d77b9a7c0f1e3414b1fa7007a8c22b62b001c