Merge aef49242a743b67ba6279970ae9995f46a7f03b8 on remote branch

Change-Id: Icb12576e59078396af12e3c58d585d5e3bc74cc2