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

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