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

Change-Id: Ie02f5e2a30c5df43ce0d088f93e73c981537d792