Merge "API review cleanups." am: 6c812cc994 am: 70c3352ca8

Change-Id: I7ffef82ee88947e5025a719103f218eec003a934