Merge "More API council tidy up" am: f4e1ac840c am: 5846bfad68 am: 941751a606

Change-Id: I6d3b688fdd0c3cc8a9f40e3aaff5d1142569ed3a