Fix JSHint issues

Change-Id: I0d63ec803f9cc8719f5275717b788812149a94c5