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

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