Merge "Updates based on API council feedback." into rvc-dev am: 16c9fb8c am:...
Merge "Updates based on API council feedback." into rvc-dev am: 16c9fb8c am: 34aaeede am: b232e394 am: 542c43e5 am: 95dc8096
Change-Id: I8fb4798452a4c9f26378ec6bca16188d1cf7247d