Simplified FQNs and imported classes

Change-Id: I04e4eb99fe829e29b058d3dc9fd33d33840477c8
Merge "Simplified FQNs and imported classes"