Merge "Remove about-to-be-renamed class from preload list."