Merge "API review cleanups." am: 6c812cc994

Change-Id: I299dc3b97cd8f3164b515e6b265dc3acf972076e