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