Fix one more instance of attempting to update readonly tokens.

* A lot of pain selective cloning has wrought -- made worse because the
  errors seem to be dependent on async code paths. Hopefully one of the
  last update sites that needs fixing.

* Fixes a few more crashers in local RT testing.

Change-Id: I7e6613c79893538a5e22f0b959a5a5e0bea0a109
Merge "Fix one more instance of attempting to update readonly tokens."