Merge "Merge "Per API review, revert the API renaming CL." into nyc-dev am:...
Merge "Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6 am: e214ff00" into nyc-mr1-dev-plus-aosp
am: 4c0848d9
* commit '4c0848d9':
Change-Id: Iaad8b76b54375424840484e2d0899148558c70d7