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

Change-Id: I976bb62b349a5de4655d44245a06d8898ed96461