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

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