Merge "System: Fastboot: warning fixit, misc bugs and cleanup."