Merge "Remove unneeded methods" into oc-dev
am: 9a8f641801

Change-Id: I5532580c81fcb337bf7a7d22cf148b72f73ba8f6