Merge "Removed deprecated, hidden method." into oc-dev
am: 17efecf48f

Change-Id: Id79feb953db68214e848e9bb3f8f3aaec6d56824