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

Change-Id: Ib887c15c7e8a62b22b616214f95b986448069815