Merge "hwcrypto: Removing batch key definition" into main