Merge "Fix fastboot memory corruption."