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

Change-Id: I103b55cb062d140d0f290475aa378d7c851eed40