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

Change-Id: Ib367b14ebf55ea361b4ea2d7a131cb6d133130a9