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

Change-Id: Idee829d7a874cc2dd7c850c5a9b8807a1d72ecd1