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

Change-Id: I5f1f2c5bca0f47c163c7c67661bcefbbbc7d8db6