Merge "API review cleanups." am: 6dec06ab17

Change-Id: I3300d6b93a2470fa6feb73003ba6015fa023f600