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

Change-Id: I8e5854829bd1a85de9ba2f074f3e7eb5098fe70e