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

Change-Id: I2af7c8972b9150832465dfc64786d0356b6a0d5a