Merge "Record even more stats even more often" am: 72a708d6 am: 3204e5fc am: b9b62ed5 -s ours am: 71f62cbd -s ours Change-Id: Id1e402dcc55e1dee664dd7ff8942a69ac38fa55e