Merge "Add profile class in SubscriptionInfo database" am: 1403b61c05
am: ec0c47f5e7

Change-Id: I7778eac7340eafc2ff80dedc6064c4d655e58f15