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

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