Merge "More API council tidy up" am: 21703348f3

Change-Id: I55e184870c5b0f32a106a3cd7a5cedb0629009f1