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