Prevent JSON parsing errors

Bug: 61137
Change-Id: I2df6b6108bb7834b927205d3b6afa69354cecaf7
Merge "Prevent JSON parsing errors"