Address API feedback

Test: n/a
Bug: 149216359
Change-Id: I52019474b244816a5909fac4437d888cae81219f
3 files changed