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

Change-Id: If018a37b418cffb9bf62ae763b77a89a9360c55f