Merge commit 'b153fe65fb9f9e616596e3bc11dab09bd0af0911' into manual_merge_b153fe65f
am: 67181be1b7

Change-Id: Ife8a26061be0dc33130815bc73e61262c16c3d1e