Remove unused imports in api package

Change-Id: I7bb20d2b04a733f9ed5fa3792e6be7dbab325a59
Merge "Remove unused imports in api package"