Merge "BUG-1790: detect existing unmodifiableMap encapsulation"