@Rohita83 - great, thanks for taking that over.
I think the correct thing to do is to have a ros2 devel branch created in ros/diagnostics (https://github.com/ros/diagnostics) and then merge your changes there. I had created an initial PR just for visibility (https://github.com/ros/diagnostics/pull/71) but didn’t get a branch created. It will be easiest for others to find the port if it’s part of ros/diagnostics.