Merge "Remove wake lock checks from TimeDetectorStrategy" am: dc20cafc am: 258588ec am: dc39d0f2 Change-Id: I5481acc660b14c86cbedbb819c16a858e1c26c23