Merge "Add missing application ID tag to AES/HMAC attestation calls" into oc-dev