Merge "BUG-650: squash maps to Collections.emptyMap()"