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

Change-Id: I36ef01d6b688908cd906f5975faed2b6df9879d0