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

Change-Id: I5137533523ad0331fb2c6544fdd52bc026f84cbf