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

Change-Id: I642777126bf77db09c8b64a8302145472272c9c6