Merge "Remove wake lock checks from TimeDetectorStrategy"