Merge "Update kernel configuration to support contivpp"