Api review feedback.

Change-Id: I4628fcec43ec5dbacd208401d9ace2dbe658da64
Fixes: 35812235
Fixes: 35812334
Fixes: 35812179
Test: make
4 files changed