Merge changes from topic "am-4c64b718980c476b9ef2d8d0492e6630"

* changes:
  Merge "[automerger skipped] Merge "Invalidate buffers on transform change" into tm-qpr-dev am: 00a8c5bc -s ours am: d9e85543 -s ours" into udc-dev-plus-aosp am: 97eab2c6 -s ours am: 3da2a1e4 -s ours am: f7d61917 -s ours
  [automerger skipped] Merge "Invalidate buffers on transform change" into tm-qpr-dev am: 00a8c5bc -s ours am: d9e85543 -s ours am: 6b015038 -s ours am: 6422db10 -s ours am: 92e34408 -s ours