Merge "grub.cfg: set serialno for boot_fat.uefi.img" am: b8a1917aee
am: 3315bcdaf1

Change-Id: I76ec85619b82182e4c88ff5cb0951d55f27bab7a