Merge "Per API review, revert the API renaming CL." into nyc-dev
am: 03d3f4a6cb

* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
  Per API review, revert the API renaming CL.

Change-Id: I536acb34c3d4b531db777a0635ccdb173db1183d