Merge "Remove erroneously added APIs." into nyc-dev
am: 51d65d26d2

* commit '51d65d26d2bedc96563feaa4d4239442d8e33800':
  Remove erroneously added APIs.

Change-Id: I6f03176bd76f7c9cb8c1becf74014f1fa9430882