Merge "StatsManager throws exceptions" into pi-dev am: 6b317915e8
am: b1d3483102

Change-Id: Ib8b72e4a6a21300ba843325a69847856bd9346aa