Fix jshint and JSON syntax errors

Change-Id: Ib3e68954714188670f20bfd8b5be73d361a81176
(cherry picked from commit 19ec6628012a3c4651fe4538b3fe586c5150e201)