API review cleanup.

Change-Id: Ieae7d450308b5637ed4253fe9baed3634c6ed141
31 files changed