Merge "Make members in SubscriptionInfoHelper non static"
am: 2489197ba4

Change-Id: I98b47cc26649866113cb66b4164509117c674697