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

Change-Id: I01b818b51b1a536427ca086ff06d5d28b0d550a8