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

Change-Id: Ic8345f1029d4027a60942d69abad81eb51564113