Revert "Revert "Removing deprecated APIs""

This reverts commit eb9969557213e7a8ef5cd574cc8f1eef87feb6a2.

Change-Id: I3e376c373bd7f0333e3befff657e3a6f44d04b9e
2 files changed