Merge "API cleanups." am: 1f54023761

Change-Id: I948160b0a6d130de1bf5b7dc28fcf9741f99ae3e