Merge "Make fs_mgr_access() available to user build"