Merge 6c43005be3cf7f685fd8e02d698057e7620da04b on remote branch

Change-Id: I11af94e89f3301cd2e9cb002a0a808ba41665ba2