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

Change-Id: I36387502a6f2202001076f1fac40708e87e9ae70