Merge "Fix kernel panic when boot up"