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

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

Change-Id: Ibdd0b9d5ca307c0bbc59b5be5d1f47cf51e67e5f