Merge "Tighten up ahat public API."
am: 321b3ca9a3

Change-Id: I76063bccf145f8b748c7f53e2a054d05da2c7fb2