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

Change-Id: I7eb4cdd418d987ef7a35975b429d33fcdccd074b