Fix JSON breakage

Change-Id: Ice6ac9e72c68d09808701d645f280fea7788d750