Merge "Someone is still using these APIs." into oc-mr1-dev
am: 9bb002ef79

Change-Id: I6197e014334790960e4060311d7b0e015438c953