[automerger skipped] Merge "fs_mgr: support -o sync" into qt-dev am: 607611e016 -s ours
am: 8ca4bc4825 -s ours
am skip reason: change_id I1ad8811b07657727d8227d3668f58b0fbc7e7609 with SHA1 5ffa970489 is in history

Change-Id: Ib9266dc2f9c694c2f5a7fddddab255eb732b5138