Merge "Fix "fastboot flashing"." am: 67529d29ca am: ccf078da71
am: 6903e671eb

Change-Id: I371d15174d1ffe1d022742ee933f0c33eaa09672