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

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