Merge "Fix google-explicit-constructor warnings in dumpstate." am: a70396971e
am: 347b6f4c35

Change-Id: Ib2b6733852c8087a1a0172c3f4399a622a313f50