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

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