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

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