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

This reverts commit 37bcc19785e3aaf8c6d742bebefd104f851f3aa9.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the message_store_map_switcher sub directory