Fix jshint and JSON syntax errors

Change-Id: Ib3e68954714188670f20bfd8b5be73d361a81176