Merge "API cleanups." am: 1f54023761 am: ed625ec66c

Change-Id: I26cfd57ec28adbb33257dd57b6cce7605fe9b7a1