Merge "Add EHPLMN and HPLMN to SubscriptionInfo"