Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.343' into qt-qpr1-dev

Bug: 145572601
Change-Id: I0a35aff59ba9e4a874e5a57ad59eca69985c75bf