Merge "Finish adding manufacturer and model to device ID attestation" into oc-dev