Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev