Merge 6b8d1e374d35be9a0e1803b509304d33bd17bf68 on remote branch

Change-Id: Iaa9aa83c1fa71d1a876ab48e75e6bd35c79b58ea