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

Change-Id: Iaf7d6950c821acd48c87dd76b747a8065193de29