Merge \"Revert \"Add state for loading/unloading apps\"\" into nyc-mr1-dev
am: 0aee1b4163

Change-Id: Ifef46e91e84046aee792b14c36b42edd613406e1