Consistency

Quote JSON keys.

Change-Id: Id6cab25e0c755a8e505c384c8ce02094bd68652f