Added license header to a couple of files.

Should be in 7434210c5fd10af188a0b01b98c172c219283c57 commit.

No functional changes.
Fixed a couple warnings/errors from CheckStyle.

Should be in 7434210c5fd10af188a0b01b98c172c219283c57 commit.

No functional changes.