Revert "Replacing deprecated APIs"

This reverts commit c394c27c39198370d82e5bb8c30ce7eff2e4a002.

CRs-Fixed: 2454109
Change-Id: Ibaffe0e674d22882b426732271aef29560676d69
2 files changed