Merge "fs_mgr: support -o sync" am: 2184ecb8ad
am: 1d8e339ba9

Change-Id: I8468ac4529389b8f443c6cc419f5cbdbc0296d64