Merge "Remove hardcoded msgid.  We have already leveraged in TC." into klp-dev