Merge "fs_mgr: fixup 'size' attributes of fstab."
am: 9d24734b5c

Change-Id: Ia993d4dc4f94a2de02c041f07a9208dff42389cc