Removed unused imports

Change-Id: Ief6534ee25a83027979d92c9ce3a92e0ea28c07c
Merge "Removed unused imports"