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

Change-Id: Ie235876f3ed86d5227f06915d33906c4961827ff