Completed json output option

Change-Id: I9977cb4670be502581a622c59c17858512ffd673