Added new versions of the APIs that need renaming. Bug: 17008230 Change-Id: Ic74d21115dd250082f6dbc45d1301635cc176cfc