Merge "Use new SubscriptionInfo constructor" am: e8e24e7e0b
am: 188272e12b

Change-Id: I3bd584dd5e8258713bd101e488ffefea81ad0a48