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

Change-Id: Ie1d3388ad705320dcf0764f43532713f2e159978