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

Change-Id: Ia85bdccb4c6b15c6b5b7974f4cb5cc34af04d8d1