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

Change-Id: Idd6aa61bf830ff5e5086388a6ea32b76ed78aea1