Merge "Fix "fastboot oem"." am: dbe9ab1074
am: c9d545855a

Change-Id: I22af3acd882355fd096d3e6078fe7fb6aa8ce2b1