Follow revert back to oc-dev APIs. am: a731198905
am: 702d7f32d2

Change-Id: I5f5ffacd8c90bde8af6b8202f8677f792650f963