Revert "Trimmed the branch to only the message_store_map_switcher sub directory"

This reverts commit 693c386a05d0a84db2909bef0bd406901e9046e9.
Rebase from 'upstream'
Trimmed the branch to only the message_store_map_switcher sub directory