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

Change-Id: I9406681dd70095b74cfd8b332cd0bb4d2dadad76