Merge "dumpstate: convert sprintfs to snprintfs" into nyc-dev