Merge 570f7493cd534679611ebf62a881efe9860a0234 on remote branch

Change-Id: If2a4d18a6a8a90ed30a6fe8cf597bf3697310754