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

Change-Id: I3b7e0f86c18970ade30dc37d4d1f1365fc29be41