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

Change-Id: Ie59b4be6f3f78a4d1f719688bb8197ef4b28c857