Merge "StatsManager log lines should be in logcat" into pi-dev