Merge 74cb39b09ea1e769ac02295cf15709ae86ef6e79 on remote branch

Change-Id: I8f3fc9b31537b8478ca3c35375a4c59db787cc1b