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

* commit '8a21ab00e5ec5141e4bd745ab9e7f161db98cb1a':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.