Merge "Properly handle empty map after read-only map."