Revert "Removing deprecated APIs"

This reverts commit fb530c71ac95143ebd049df10287278920e4aa37.

Change-Id: Idcbfafa092d6a92eb093996eba3175ee109ace80
2 files changed