Revert "Revert "QuickBoot cleanup""

This reverts commit cc2d33cabf39b834b710930c6cd8eb146db89673.

Change-Id: Id21cf5298e8c07306779270650b3871d474661b1