Follow revert back to oc-dev APIs.

Test: builds, boots
Bug: 62431162
Change-Id: Ibee5f29da756b6922109b95c36fd340f02e1905e
1 file changed