Merge "Fixed typo during stopping fastboot" am: 8834b4ea0a
am: cfcadc3b33

Change-Id: Ie29311740033f6581f4fdcfe66cb65c970de7ebe