Merge 7d13d4867bfe79bc8c9836c26cab372b5572bcf8 on remote branch

Change-Id: Icbeff68b78402a23759b306b123e55f717fe032a