Merge "Add free short codes for direct carrier billing and others" am: 73c50f7dbc am: 6f8c54a16d
am: 2b06e19f2d

Change-Id: I50e107a8dc433cdc563ad6663ec5feef8e992fc2