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

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