Merge "[automerger skipped] Merge "Add profile class in SubscriptionInfo database" am: 1403b61c05 am: ec0c47f5e7 am: bf59b843f4 -s ours am skip reason: change_id I28a6d64c90db94ef0735f4d97f430560b733e797 with SHA1 c3eb446c52 is in history"