Merge "Fix device-level wakelock battery attribution" into sc-dev