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

Change-Id: Ic6be4e24923bf21e6416f1d1b13f3a34ef8aa2e2