Supress some PMD errors

Change-Id: I5e45cb43efbd6c430650128ee9b1e9045d547775