Merge changes from topic "am-c80df855404e43969284f2c62256bb6e"

* changes:
  Merge "[automerger skipped] Merge "Hold onto occluded change until it's committed" into tm-qpr-dev am: 0cbdbb64 am: ba2cbd95 -s ours" into udc-dev am: 2428df9b -s ours am: 5b1fed9e -s ours
  [automerger skipped] Merge "Hold onto occluded change until it's committed" into tm-qpr-dev am: 0cbdbb64 am: ba2cbd95 -s ours am: 48aa9c45 -s ours am: be3a5c39 -s ours