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

* commit '12863b2a1d7c97e99b7201ae6209f5c861fd46a7':
  SF: Also edit currentState in doTransaction

Change-Id: Ia1367baa3da6415e46caccc1ec75c8ac9026d131