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

Change-Id: Ie4dacc599a561e60f40e5ef26f03aa7ef19fbda8