Merge "Update SMS shortcodes" am: 9009d0a33a

Change-Id: I7f7a89ee416ead7ece5a893f2cdc4728a73f9901