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

Change-Id: I12552d81be6b8a58c9afc02c754918776d6cdda9