Implement comments from API review

Bug:  64372008
Test:  Fix comments
Change-Id: Ia2bc0ae4c45015e7965b544f5d46f7e2a3ff0e2a
1 file changed