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

Change-Id: I1961b6e1a5118227d31d62a61dc61d30a2f322c0