Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.9.R1.10.00.00.558.049' into qt-qpr1-dev
am: b0cacfacbc

Change-Id: If825678d7fc1029fc826347299216a13424eca25