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

Change-Id: Ic78e1312a1230ef6765551c6104b3caba8ca6a08