Merge "Handle invalid subscription id" into lmp-mr1-dev