Merge "Remove old SubscriptionInfo constructors." am: 03fcb263ab
am: a009bfe6e1

Change-Id: Ic85d4734710d84912605d0b25174cbd50206d886