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

Change-Id: I53cf4399564c22afacd4c6f47ee1e77498d4a39a