Merge "fs_mgr: Remove fs_mgr_flags #define's" am: c03169caea am: dd5a7a6547
am: f4e0ef0a8d

Change-Id: I443298792173d507fe0c8ab4ec779a02c1e64697