Merge 4af6c141d08a4c90d7b90827ebce02a5b23b03f8 on remote branch

Change-Id: I1fe4b4c15336a5a5ae6aa61f4538fa9549877d0b