Merge "Reduce nested objects in JSON dump"
am: 6ce82f92a0

Change-Id: I4bc7dbe9b27f5579fb45d03f87fc4871bec7b2b0