b/16300640 Remove references to mockup classes