Merge "Adding 20 free short codes for DCB and other purposes"
am: 70fea2df2a

Change-Id: Ic63e088d49796b6e98dc92bc3b0b261958d73e8c