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

Change-Id: Ib00c06283b02065aecf4491b3937d9fb569b469a