Merge "Fix collisions due to ignoring outer class names." into nyc-mr1-dev