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

Change-Id: I95ee4f9fa28feafc56c5def43339cc9750c6a479