Removing unused imports and swiching off deprecated APIs

Change-Id: I08fd2c17bcad42f0216b140c0511f48a782c8018
1 file changed