Merge "Address API council comments."