Merge "fs_mgr: remove by_name_symlinks_map_ from AvpOps" am: 8995970ce3 am: b793f04797
am: f890024d0d

Change-Id: Ifdee1b466d447b1450a25dc770ec87936969fde4