Fixing broken JSON - removing trailing comma

Change-Id: I921e95477ba66c676f523309fbb9019a5fa13734
Merge "Fixing broken JSON - removing trailing comma"