Fix collisions due to ignoring outer class names. am: 35e0d1defa
am: df2f58d5ec

Change-Id: I9b41efe6399a656b26a933b2ea63e3e54e58a4b5