Minor: revert semicolons after package declaration for java parts inside kt file.
Buildserver auto merge