Merge "Allow device properties tags for attestation" am: 9a2f497439

Change-Id: Ie6d745578c951cd7c69e709b63d7051055bb644c