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

* commit 'd1fdadad2c90030cd325eb379baf90847b6b116a':
  Handle invalid subscription id