Revert "Revert "QuickBoot cleanup""

This reverts commit a83e35eb1d393305143d41b598d091395d88820e.

Change-Id: I8fcb660679ab855ec7b703a6eabf3341dfbef3a5