Merge 360af8d591abe36005b3e97c0a3ea1dfe2b6dfe2 on remote branch

Change-Id: Iafd112f01fabd9eee31f388c35ab5cdc795e29f4