Merge "API council suggested edits, part 3" am: 7a4cc05d45
am: 4c4fb3bdfb

Change-Id: Ifc0a36557d8a5a1a7d19e00550ae2a1997db800f