Update documentation according API review

Bug: 174580495, 174580077
Change-Id: I2791eb1351057a55caa99e9e1b95d26a31d708f2
Test: build
3 files changed