re-order code to have public api methods on top, annotate with @InterfaceAudience.Public when appropriate
Renaming to match current public api spec.  Annotate with @Public methods