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

Change-Id: Ic8d133110bf9959c090042853bf2cce3a741b176