Merge "remove spurious 'struct' on Stats" am: 34ad903954 am: 39b66243ee am: 42ad8ec690

Change-Id: I7d6cb9ec24cb3012f445a46c746c5f8009bacc35