am 3142bdbf: am d150618d: Merge "Revert "System: Fastboot: warning fixit, misc bugs and cleanup.""

* commit '3142bdbf844e62e88b9aa64598081e702421e82d':
  Revert "System: Fastboot: warning fixit, misc bugs and cleanup."