Clean up broken JSON samples

Closes-Bug: #1283713

Change-Id: Ic89203e7b955b07482916cb10870e4b3a47b252f
author: diane fleming
Merge "Clean up broken JSON samples"