Merge 570f7493cd534679611ebf62a881efe9860a0234 on remote branch

Change-Id: I2ef3267d27037797710b2b1884aa130bf13ad780