Merge "Make IDumpstateDevice 1.1" am: 99ad09b7e7 am: e067d70f96

Change-Id: Ie88c44e343af970412a32e20a76f336b1def91d9