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

Change-Id: I16d0e9bd47408aae001d2b08d9508a22d82ed43b