Merge "[automerger skipped] Merge "Remove old SubscriptionInfo constructors." am: 03fcb263ab am: a009bfe6e1 am: 9e07ab7689  -s ours"