Fix JSLint errors

Change-Id: I40233a0538f766e86b693051c4d60b72c8467e16
Merge "Fix JSLint errors"