Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev