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

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