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

Change-Id: I3f7e26ff002616ebc642f7358e846e7bf093437c