Merge "SF: Also edit currentState in doTransaction" into nyc-dev
am: d224e6111b

* commit 'd224e6111bf4532fb1c1fc021c20285b38bc80ec':
  SF: Also edit currentState in doTransaction

Change-Id: I30b6170c8f41a7e330511ad70abd2257a34bdee2