JSONHandler renamed to BaseHandler

Change-Id: Id4d1db64d24d624cae83d7ef6f0f1fd937ebe702
Merge "JSONHandler renamed to BaseHandler"