Merge "fs_mgr_fstab: translate reserve_root to reserved_size in fsmgr" am: c47618662f am: 394e2ad0a2
am: fb43140c31

Change-Id: Ie9160e8718a505cfc5bc487c8dd6635ef2841c35