Merge "BUG 6952: DPN can't be added in multiple TZ"