Merge "Cumulative wakelock time per uid" into oc-dev