Merge "IDumpstateDevice@1.1 polish" am: d05efa2c1f am: 74f96cef00

Change-Id: I9ea93003480f2b119f378452fa72c243405cb67d