Merge "Add CTS tests for REMOVE_DUPLICATE_ENTRIES boolean parameter"