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

Change-Id: If6f974dae2bfb94e34e1c03833e6eca000f5774e