Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.021' am: bf6a61c40a

Change-Id: Ib4a01e5ae354a01c89d87badcb1265550e6fab3f