Merge "Use non-wakeup alarm for delay constraint."