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

Change-Id: I5647ae42fce11c89a13ffab507ace5cef2d5826f