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

Change-Id: I5b36fb8fa0a8f78d050d81a99a1ff11374c8c28d