Merge "Record even more stats even more often" am: 72a708d623 am: 3204e5fc63
am: b9b62ed512  -s ours

Change-Id: I390cd1f15092038517820f2ed1dde7ed09f6216c