Merge commit '3609371c949ec3c31fc88bb6a2231774fdeb25c1' into manual_merge_3609371
am: cb47e738d9

Change-Id: Ic2f00a437e70f6067fbf3bed3e0d3c08c8c66604