Merge "IDumpstateDevice@1.1 polish" am: d05efa2c1f

Change-Id: Ib2fb4c0749f96fcfea01ab957f5da1bded3dd852