Fix JSHint warnings

Change-Id: I9dbd7bc95eb151a7284c21cf07e5ab29139fbcf2