Merge "Remove unused public APIs." into oc-dev
am: feaa8b0f01

Change-Id: I7ffbb8a98d342f12304bb85ce45498790363703c