Merge 294f08dee9261665615ae61e9b7c597f507582f3 on remote branch

Change-Id: I6b61d92f84d43aa6e2b7dbd815504534d4b2f2e5