Merge "[automerger skipped] Merge "Update SubscriptionInfo o use strings for mccmnc" am: 0babf181 am: 08a4eb94 am: 2656f6d0 -s ours"