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

Change-Id: I42b04ea2b7a3381b15d49bb6d6ef644277925515