Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.107'
am: 03b52014b8

Change-Id: I85e0cab326a8a63e67e52f4f634cf7c032fe757b