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

Change-Id: I66db090da3b2c0c8708be41c1f002fedee9c86af