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

Change-Id: I3b8e79ebf16b60d9236f1ba207255950ade3c701