Merge "Cleanup API that is already @removed" into oc-dev
am: 33b4964874

Change-Id: I933de065f75417e16541c86089e981b3a9fbd362