Merge "Add E2eeBaseKey class." into main