added ugly mixed msg/code map_store dependency (needed by android_apps)