Merge "Do not preload java.util.ImmutableCollections." into udc-dev