Allow --json output override printing dict/list

Change-Id: Ib02f244cb969ac8dfc92ac94e6e915063d13764d
Merge "Allow --json output override printing dict/list"