Merge "[COMMON] Fix trailing blanks found by pre-commit"