Merge "Merge "Removed deprecated, hidden method." into oc-dev am: 17efecf4 am: b4891d4e" into oc-dr1-dev-plus-aosp