Merge "kernel: Fix build errors due to uninitialized variables"