Update from API review.

Change-Id: I16b1c566f91167aac9615ac59dd297a154c828ea
11 files changed