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

Change-Id: Ib079f8e304d27ba95beb3001b08b83a3ad8d019e