Avoid wildcard import

Change-Id: I324789212a5db4b97625107241eadb8728a30b83
2 files changed