Update for API council feedback

Test: N/A
Fixes: 169331021
Change-Id: I8ae9133d21f177db1a98fa43fde28a3f81820d5f
3 files changed