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

Change-Id: I3f1a3e40e56070f18e7b62dea9b364724581cc3a