Merge "More API council tidy up" am: f4e1ac840c

Change-Id: I3a14ce6e52bf6ac254c996c9739eac9fccbd6af6