Merge "batstats: fix wake lock tracking, service bug"