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

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