Merge 340e7f7cb0b2ef52552ec5aa8da189c8fd24d892 on remote branch

Change-Id: I30aadd6de8967e5b225504e30b956db2c356e384