Merge "Fix unique ID attestation." into oc-dev
am: ead11aa0e1

Change-Id: I921dc431418e2d1e5828536e5cc95472e47bfb47