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

Change-Id: Ie2b9123e642d66ae7fefa6c50fc015aed6f7ddc4