Merge "Add free short codes for Direct Carrier Billing." am: 8b5bbbbfa4
am: 72813ddd5b

* commit '72813ddd5b63f91ba8b3e84b511c7683a10de885':
  Add free short codes for Direct Carrier Billing.

Change-Id: I9c1d62bc3be22504e66218342ab18cf436952d88