Merge "fs_mgr: support -o sync" into qt-dev
am: 607611e016

Change-Id: If99555bb7062eec589f5d5d5472bad4a7f1e72dc