Merge "Fix issue where the carrier presence cap. may not be set on phoneaccounts." into nyc-mr1-dev