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

Change-Id: I10e07d5df32336ab9ba40353312864084445148b