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

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