Merge "Fixed the incorrect APN dedupling"