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

Change-Id: Iaa2f0574fd83fb1cbe6bfbe65424e12e10b1076f