Merge "More renames for API council" am: b03661f5d8 am: 02e64e352c

Change-Id: I83a0a98b18cffd92a8f2eed727b5fa277d89a5be