Merge f843e98f1efdf695d52b08d5fe3a0e92c8deec82 on remote branch

Change-Id: I2c1dee7988bfd41f81ad6b66c83d0c3e4a6a130f