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

* commit 'beb9a03b716d152ea25813fca3a93a1ec781a685':
  Remove hardcoded msgid.  We have already leveraged in TC.