Merge "fs_mgr: support -o sync"