Merge "Revert "Make stopped state a first-class thing"" into nyc-dev
am: 825fa4d

* commit '825fa4d5ae7b2907ee1769d09e6333306de2a92e':
  Revert "Make stopped state a first-class thing"

Change-Id: I2f2a6281d0e0ba9587b00cdb6f1cb32ac632ee41