Merge "Fix "fastboot oem"."