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

Change-Id: I338b4da4d55758c709e0d088c7223a3f1d578f0e