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

Change-Id: I53f96e1540333082ff71f89baa1b98b745ca1cbc