Merge "Require FAT to occupy at least one sector."
am: a4f74d335c

Change-Id: I75619438a719fb8403200c4f589a69644529e68d