Merge "dumpstate: convert sprintfs to snprintfs" into nyc-dev am: 853f8f9c0b
am: bcfac7ea88

* commit 'bcfac7ea88a976f2449b5583352d703cb4937652':
  dumpstate: convert sprintfs to snprintfs

Change-Id: Ia72e8e3a312d04429d791ec6188bc773c0647802