Fixing linter warnings
Fixes

Change-Id: If530a375c51f146a838154499529b9eed5c8507d