Merge 84f940669e1c49e5fb8ffe7c7dbe838f6d5611a4 on remote branch

Change-Id: Ib0c9f2a1ad96fc5d6b68da823c6e0edae7887c83