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

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