Updating the JSONP encoding.

Change-Id: I635a59528f958b60038f97c4b384fc137e77b194