Cleanup imports to prefer .* imports

Change-Id: I12c9a59f4b3fd332d9fbe825f894bd789d29410b