Merge "Merge "dumpstate: convert sprintfs to snprintfs" into nyc-dev am: 853f8f9c0b am: 6f0eb8f06d" into nyc-mr1-dev-plus-aosp