Merge "Add EHPLMN and HPLMN to the subinfo database"