Merge "Attest device base properties" am: 547aeb27e8 am: f078d49979

Change-Id: Icbca4968438f659bf3d636100b5b172e63eaefb2