am 7ebd2dee: Merge "Handle invalid subscription id" into lmp-mr1-dev

* commit '7ebd2deed7b692f537d565859b7c454f35d6b85a':
  Handle invalid subscription id