am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev

* commit '6e04a7b65488656c4cb72d99d285050d56068112':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.