Merge "Make IDumpstateDevice 1.1" am: 99ad09b7e7

Change-Id: I4e2eb97b0341352acf9ae2f63a2da508f63d3c0c