Merge "Write enum string to JSON dump"
am: 5ad90b10e1

Change-Id: I4e9172b343cb8dff3069563fbb460f93e6a11f70