Address point 6 of https://github.com/ros2/ros2/issues/1735.
Address point 6 of ros2/ros2#1735.