Merge "Bug fix for wakeup sensors."