Merge "fs_mgr: support -o sync"
am: 2184ecb8ad

Change-Id: I26bf22694ffd6680ddd3278db25fadf7d65bf241