Merge c66e0db6cf7c5b739ee85ae9d3b6a863aa9d7572 on remote branch

Change-Id: I69a69c54d2693f56bfef3d58f6a49f2cd0002fcc