Fix codenarc issues to unblock merge

Change-Id: I14f30b0780627249bd908ebc09ea2a79ac9a92c4
(cherry picked from commit 49d6781485955465138b7b40194df2a1ae2297f8)
2 files changed