Reconcile fs_mgr

Change-Id: I983831806d846b7a064f3f231ac06673bcd15164