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

Change-Id: I2e937e78c4506698c26bb9fdadf0d5ce3198b8ab