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

Bug: 132954074
Change-Id: If77548c6d39e38c30b98d00abbf66810562ff72b