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

Change-Id: Ibf09c09a0f651a540f522b7666cc66ec25f5f261