Merge changes from topic "am-63372c51878b4f3cb935982e8e13e7f2" into udc-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-cf2f51fcc9a649cf9c8e27061e88ec3e" into tm-qpr-dev-plus-aosp am: 3af1633d59 -s ours
  [automerger skipped] [automerge] Invalidate buffers on transform change 2p: 5545b1cc36 am: e0c12b743a -s ours