Merge "Remove trailing spaces from JSON dump"
am: 83e7410d9b

Change-Id: I9f52f84f217df7295162ba408843f2351eb60c9a