Updating refactoring in JsonConfig

Change-Id: Id06fd247f4a7ab628c5f802d426703263e4a3090
Merge "Updating refactoring in JsonConfig"