Merge "Removed deprecated APIs." into oc-dev am: 4b91fe8699
am: 3eee11cb4d

Change-Id: I39859572bfd0b8e34d02ad96147364e0f4ce2ee5