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

Change-Id: I3079be0714147b35574d5b015a93466565a31fca