Merge "Clear one-time test key, add missing cast in big-endian l2 fib key computation"