Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev