Merge "Update SMS shortcodes" am: 9009d0a33a am: cd57c919be am: d30fed6da1

Change-Id: I779b4bc9f3b58dcf04fd7d95849f10e82d52d81c