Merge d896dead33e32ecd8d5ac6992641cb2a68f9474a on remote branch

Change-Id: I27e8a7d648d3e8c14c8e044018d1e6e628dd23ce