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

Change-Id: I8bf83707c8837b08624fceafebed9edb73ad7c4e