Final (hopefully) API cleanup.

Change-Id: Iaac6b2ca399eda44458c2bc1a6501672b6c85b90
4 files changed