API review cleanups.
am: 115c06ee64

Change-Id: I4141327061a178ab81735427fce28ad3cc26184e