Merge "Added identity credential key to keymaster tag set."