Merge "Fix fastboot memory corruption."
am: b6d7f2655d

Change-Id: Idc566a2dad5cdeeee1b049598d9b92e6cf7c3c73