cleaned import statement warnings

Change-Id: I67a60f68b7730bd70c12a9f7c93b2de644227bbe