Merge 83152ba370c4639c180224c451860220b1096791 on remote branch

Change-Id: Ief71ccae8ada907458e96a7f0e87c3432effceb9