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

Change-Id: I0a70020100fa5aae7fcfd98963da855b9238c4ce