Merge f7cf3ad9372f9dfaa138eddbcf42b304f9769c43 on remote branch

Change-Id: Ie5fac71aee7fe07f3e70d892c7b7d65a9ebd7eef