Merge 8f468701851efec73eae55a742426cc15ced42d5 on remote branch

Change-Id: I9effcde38696de09feb0f622673fe2909e83fd55