Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.021' am: bf6a61c40a am: feaa14f200 am: ed0dbb5837 am: bd104481fc am: 0ab6fb47d0

Change-Id: Ifadfc9cb201fad81dc920cf4af901cbb01cce65a