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

Change-Id: Iad6d8f1449f6c1f3dcd640500604bbc35b970f5b