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