am f2fb9044: (-s ours) am e60a35c1: Merge "DO NOT MERGE: Remove SMS shortcode...
am f2fb9044: (-s ours) am e60a35c1: Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev
* commit 'f2fb9044':
DO NOT MERGE: Remove SMS shortcode warning feature.