Merge "API review cleanups." am: 6dec06ab17 am: ed5c1e18e1

Change-Id: I64f5691af5d97d583a3444e004f4b8df8c66340e