Make imports compatible with Grizzly

Change-Id: Ib4f3a3976097ab5977334d1768007668e3953c45