Merge "[automerger skipped] Merge "Remove old SubscriptionInfo constructors." am: 03fcb263 am: a009bfe6 am: 9e07ab76 -s ours"