Merge 9e6774aba01fe3b160371e5f039261aa3fd4ecb6 on remote branch

Change-Id: Ia71665376d80031f01f9b8d00286733adb1e98e3