Merge "Rename isValidSubId to isValidSubscriptionid." into lmp-mr1-dev