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

Change-Id: I9c0a8548a087e120a345e5083ac4bfe5d45898f7