Merge 46a3e2710b5593c783abad1907c80dfadce0ea81 on remote branch

Change-Id: If5b1ecc8282ab6ae615108e57eabd60ee29f8fe1