[PLAT-4692] checkstyle changes