Fixup: Add some imports that got lost in the previous commit

Change-Id: I33017c4dbfa29b87dad791001cf5c0bd6ee3f5db
1 file changed