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

Change-Id: I6ba51a936bf43b27cff0118a0f97655e80d57d0a