Removed Calls to deprecated APIs and unused imports

Change-Id: Ibaaf3418ec2c97a99495eca7ea546af415370c3e
3 files changed