Address API Council feedback.

Bug: 37422306, 37419881
Test: Build and read docs.
Change-Id: Iafad3be27f81ed343ee43d1a56fa80089104f7df
(cherry picked from commit 71e84b9d5ec80efb0c037671b2bbfdfe828a23cb)
1 file changed