Merge changes from topic "LA.UM.8.1.C9.09.00.00.518.090-merge"

* changes:
  Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.090'
  Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.081'