Merge "Allow device properties tags for attestation" am: 9a2f497439 am: 3fd8b10984 am: 349af3e40c am: 98df927cfc am: f4df252002

Change-Id: I54b0bda5c4473f452f833dc81d0066c99e509088