Merge "Fix invalid base64 map dump when map has no entry"