QuickBoot cleanup

Change-Id: I15d801a3acab5aebed4169838b21f6f84a9e7176