Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.158' into qt-r1-dev am: 4b198c30a6
am: fcd15fb7e3

Change-Id: I643d9ba4b3e5b952bcbedc60fc927be12fe75f20