Fix codenarc issues to unblock merge

Change-Id: I14f30b0780627249bd908ebc09ea2a79ac9a92c4
2 files changed