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

Change-Id: I0cc50ebd44cc566fd6db1ddeba3ecd9b3682d62b