Merge "Fix the Rubocop offense TrailingBlankLines"