Merge "IDumpstateDevice@1.1 polish"