Merge "Add test for loading JSON dump"
am: 74343ae993

Change-Id: I242b9f35b9fb38b2a19f42602b2c09a9be59f5ae