Merge "Update SubscriptionInfo constructor" am: af9d175bb1
am: 7d4d330480

Change-Id: I1c02b54a397aee40bdb81b02928423fab9b65cd6