Merge "Add profile class in SubscriptionInfo database" am: 0fa56be4c3
am: c2d548ad52

Change-Id: Ieb2e9b4c28610862729865d7fcd01c94251ac8a3