Merge "Remove misleading comment in sample dumpstate impl" am: eac1c71ce4 am: db2de2690c am: 35598f32b3
am: 39e457bcef

Change-Id: I5887906f089b5b08af8e894010bd6560f3df8e08