Merge "API Review cleanups." am: f2a5615087

Change-Id: I516e72d3f32c40ff480e55ceed222aea7d5ce9b3