Updates based on API council guidance.

Test: builds, boots
Change-Id: Iecc296790d8c2d88eefe73f5be99dc317296484f
Fixes: 37775662
Fixes: 37748635
Fixes: 37673408
Fixes: 37672564
Fixes: 37672218
Fixes: 37638323
Fixes: 37637423
1 file changed