Merge "Record even more stats even more often" am: 72a708d623
am: 3204e5fc63

Change-Id: I3e9134c0750117bc7145975b51d3b19d2f11b668