Merge "Fix fastboot memory corruption." am: b6d7f2655d
am: 944cc0d002

Change-Id: I98f56eeb4a7a49e33bf4113c495f97c1cab4eada