Merge "More renames for API council" am: b03661f5d8

Change-Id: I1bd4db67106f8e885ca8449103af569ab100c361