Merge "Fix the Rubocop offense EmptyLines"