Merge 7f7fc2d65e77a4bc7101d850facaf2dd87b030e2 on remote branch

Change-Id: Idaed8cd9ac53717afdcf56987eb5b5f9cd62195b