Merge 8f468701851efec73eae55a742426cc15ced42d5 on remote branch

Change-Id: I2124871242afb1111e8aff55713aa330427e9b2c