Merge "Merge "Removed deprecated, hidden method." into oc-dev am: 17efecf48f am: 284ec6eec7" into oc-dr1-dev-plus-aosp
am: 5f0110cc02

Change-Id: I0236a6540b0767d634002538fb723c80eeca4d9d