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

Change-Id: Ic4915213105ba31c63d97187297c652a477e99df