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

Change-Id: I63289b6ddd887ed0dbd4c7ed88879721172562a4