Merge aef49242a743b67ba6279970ae9995f46a7f03b8 on remote branch

Change-Id: I2cea2f592e5ad013da2716fa9e11658889bb8e2b