Add explicit assertNonNull() statements to JSONTest for cleaner test failures. Change-Id: I283419f3665cec632a438b4a68cc946c09e4f0ac