Queue up annotation changes to make operations safer

Currently an exception can be thrown with an annotate operation
partially applied to the DM, which would make it very hard to
cleanly revert should we ever catch that exception.

Bug: 68892
Change-Id: Idadb842d80bdf45b4d58489f4b3008644db0ad20
Merge "Queue up annotation changes to make operations safer"