Address API review comment.

Bug: 144346143
Bug: 143580692
Test: make
Change-Id: Ie90755a418b00f1d87151b7afc8c92db621ed146
1 file changed