Merge changes from topic "am-3b16675b43a34085ba420483df33b66d"

* changes:
  Merge changes from topic "am-fc577a610a0f4845b4f51b4c673fb35e" into udc-qpr-dev-plus-aosp am: 0aac7f8b -s ours
  Merge "[automerger skipped] Merge changes from topic "presubmit-am-596ac78c570647d8a0f30d123eb656a7" into sc-qpr1-dev am: f943201e am: e527f6bc -s ours am: d43e0457 -s ours am: b577f65a -s ours am: 915e267f -s ours am: 6b99066b -s ours" into udc-d1-dev-plus-aosp am: 6987a1f6 -s ours am: d281d119 -s ours