Merge 74cb39b09ea1e769ac02295cf15709ae86ef6e79 on remote branch

Change-Id: Idb6ec4d1c28a4efe2b289acb69f56ed536a5c7e3