Merge "Add property invalidated cache for getSubscriptionId." into tm-dev