Merge "Fix checkstyle warnings." into stable/boron