Merge "fs_mgr fix flags/fs_mgr_flags mismatch"
am: 5d595da516

Change-Id: I7b9c01008ffa38e45ecfc49a9bb3ee4db4082871