Import classes rather then using FQNs

Change-Id: I342835230f89e05c912c1146bb9db55969c4d75d
Merge "Import classes rather then using FQNs"