Merge "remove spurious 'struct' on Stats"
am: 34ad903954

Change-Id: Iecd6eec2787fcb1d8f7055d89075769b2f781795