Merge "Preloaded class list problems shall no longer break the build."