Address API review comments.

Bug: 28148563
Change-Id: I0b66cf6954bb7d31e76d1e6445a656abd316ebcd
5 files changed