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 am: 3bd1494d
Change-Id: I7b688ca834e06346b667e901a83326bdfd511121