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

Change-Id: I19cd23505191eaf49c8767db0845edf4a82a7678