Merge 46bbb57bf63e2d24b82a1ea914859c7afd830e71 on remote branch

Change-Id: I2d1e3caa83bbe3b260ba2c6f08760fa56b5c3565