Enabled proper imports without wildcards

Change-Id: Ib4d0f96ed5abd614478d00232b6a9a42bd5ede07