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

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

Change-Id: I6bcd675d033cc1ef46d3498174b2bc52a0072f99