Merge "Merge "Updates based on API council feedback." into rvc-dev am:...
Merge "Merge "Updates based on API council feedback." into rvc-dev am: 16c9fb8c am: 34aaeede" into rvc-d1-dev-plus-aosp am: 6cbb0d5e
Change-Id: Ib10b82c3825c8d5e0c75ab001054e5496c8d7ab1