Merge 309ff81b7e53dc62773b28e82fb097cc4a6bc4ce on remote branch

Change-Id: I3776e553071f9638687a03b5d2bce92f69666ad3