Merge "Allow device properties tags for attestation"