Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.R1.10.00.00.529.095' into qt-qpr1-dev
am: b23301cfa5

Change-Id: Ib6fa9f365b785a5b9da7fa20e9e79f8e0a513f58