Merge "Fixed logic that was passing NULL to a std::string parameter and crashing dumpstate."