Also had to fix some imports due to changes
implemented as part of the cleanup.

Change-Id: Ie232828056a7f15525f820e8e106264b22697168