Merge 7a6fc164df7ae4920f67804d1d9ad1adb1d616f8 on remote branch

Change-Id: Ie0c1e7ad1c2a2f484b3bf5c0f3f3bdf9a0c5788d