Merge "Update wakelock detector" into oc-dr1-dev