Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev