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

Change-Id: Id5483a849b7b561079f36470711c87f98785d2e2