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

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