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

Change-Id: Idec5544475dc5eee42009f4038f32b8d8b3c5450