am 48be3232: Merge "make sure to update the "current state" when we "fake" the...
am 48be3232: Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev
* commit '48be3232':
make sure to update the "current state" when we "fake" the transaction