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

* commit 'f2fb9044c58407ac305cad3e2ac3a186634f8041':
  DO NOT MERGE: Remove SMS shortcode warning feature.