Merge "Remove misleading comment in sample dumpstate impl" am: eac1c71ce4
am: db2de2690c

Change-Id: I2ba8d3b01e8ea9f802193346976a51c27048577a