Cleaned-up imports to pass commit hook

Bug: None
Test: Builds
Change-Id: I10001bc73bcf31fabb9abf340031be114afe1cc6
1 file changed