Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.121' into qt-dev am: d279d3d725
am: db4670de6a

Change-Id: Ib32aaf5ec7426c9ac666d15209ddcaa77eba509f