Merge "Finish adding manufacturer and model to device ID attestation" into oc-dev
am: 8fcab148c2

Change-Id: Ib568ef34a26d500e452887118338679388dfcf8e