Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.140' into qt-dev
am: 7bac4a6a23

Change-Id: I55e29d94bf10eb8c12c92b446dcdcda7b0882047