Merge commit '060ab99f67828791d730463a096fc998f9394518' into HEAD

Change-Id: Icd7ac11748315ce694618172fc1fd2e2a3d31cc1