Merge commit 'b153fe65fb9f9e616596e3bc11dab09bd0af0911' into manual_merge_b153fe65f

Change-Id: I7cce1a163d9cf25ddd3818a9d724721b01c32f60