Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.9.R1.10.00.00.558.049' into qt-qpr1-dev
am: 616d717a1d

Change-Id: If8bd660e121f7eaa2cdcb8cd5f9df8a92f8d9dc6