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

Change-Id: I49df5ef418cf43e60de024fb087da03b8f9feaf0