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

Change-Id: Ib53e3dff14e748d5715dcf112e828fb0f80b87a2