Merge 1f52b3ebfc7ef3b0333133320d536f8b9dd48cf1 on remote branch

Change-Id: I360e9070e24f3c3fd657a9b88b8414c8bae76d34