Merge changes from topic "am-903efd95b2b5467e9877afcc7aa198be" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "am-63372c51878b4f3cb935982e8e13e7f2" into udc-dev-plus-aosp am: f6b62f99 -s ours am: e7431318 -s ours
  [automerger skipped] Merge changes from topic "presubmit-am-cf2f51fcc9a649cf9c8e27061e88ec3e" into tm-qpr-dev-plus-aosp am: 3af1633d -s ours am: b33f6fec -s ours am: ad67842c -s ours