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

Change-Id: I2971fc5506ee6ca0d70b9b952e420e5233b8c28f