Removing deprecated APIs

Change-Id: Iac820f6fc8e252743dfc21bd3a8da69aa8811656
2 files changed