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

Change-Id: Ie515da7ba8355e467b0eb6aa14351ac02892403c