Merge "Fix invalid XML entities in APN entries."