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

Change-Id: I98019083039a6e6db74019b765dfdbc011178178