Merge "setAllowedCarriers: throw NPE on null list"