Merge "Restoring old methods for compatibility." into oc-dev am: d6c190c8d2
am: 3d66fb6519

Change-Id: I1066d1efed081776286ef8ded7933998a89e1dd8