Merge \"API cleanups per API review.\" into nyc-mr1-dev
am: 138a3f3ad4

Change-Id: Iad4f2bdc3f903a6497f97ccd2fbdc1943ebded94