Merge "Add free short codes for Direct Carrier Billing and others." am: 4d9ffdf952
am: bd92c57a4f

* commit 'bd92c57a4f74c5c6ea3b6e20964a5e7950a1f7e1':
  Add free short codes for Direct Carrier Billing and others.