Merge "Adding 26 free short codes for DCB and other purposes" am: 1585b2e7b7
am: 3a6a8b9baa

Change-Id: I61ae7d0404463c160dd22675c84b0782f33a3c5d