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

Change-Id: I951925bfc58a1b1d59a4906fce34047e6026cc0c