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

Change-Id: I71c0d2eceaf4153f853196d07688558b3979a033