Merge "sonar: Move this trailing comment on the previous empty line."